merge trunk
authorKenichi Handa <handa@m17n.org>
Wed, 23 Feb 2011 07:33:29 +0000 (16:33 +0900)
committerKenichi Handa <handa@m17n.org>
Wed, 23 Feb 2011 07:33:29 +0000 (16:33 +0900)

Trivial merge